From 67643f6f4baa8344e0fc2f9f525caa271904ac55 Mon Sep 17 00:00:00 2001 From: Hans Breuer Date: Sun, 5 Dec 2004 23:56:37 +0000 Subject: [PATCH] Implement keynav for the color picker - win32 too. Fixes bug #160437. 2004-12-06 Hans Breuer * gtk/gtkcolorsel.c (key_press): Implement keynav for the color picker - win32 too. Fixes bug #160437. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkcolorsel.c | 11 ++++++++++- 5 files changed, 30 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e6e8a9e9a2..b5520afdae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-12-06 Hans Breuer + + * gtk/gtkcolorsel.c (key_press): Implement keynav for the color + picker - win32 too. Fixes bug #160437. + 2004-12-05 Tor Lillqvist * demos/gtk-demo/main.c (load_file): Use g_fopen(). diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e6e8a9e9a2..b5520afdae 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2004-12-06 Hans Breuer + + * gtk/gtkcolorsel.c (key_press): Implement keynav for the color + picker - win32 too. Fixes bug #160437. + 2004-12-05 Tor Lillqvist * demos/gtk-demo/main.c (load_file): Use g_fopen(). diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e6e8a9e9a2..b5520afdae 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2004-12-06 Hans Breuer + + * gtk/gtkcolorsel.c (key_press): Implement keynav for the color + picker - win32 too. Fixes bug #160437. + 2004-12-05 Tor Lillqvist * demos/gtk-demo/main.c (load_file): Use g_fopen(). diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e6e8a9e9a2..b5520afdae 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2004-12-06 Hans Breuer + + * gtk/gtkcolorsel.c (key_press): Implement keynav for the color + picker - win32 too. Fixes bug #160437. + 2004-12-05 Tor Lillqvist * demos/gtk-demo/main.c (load_file): Use g_fopen(). diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c index ac171a9eeb..cb9006bb55 100644 --- a/gtk/gtkcolorsel.c +++ b/gtk/gtkcolorsel.c @@ -66,6 +66,9 @@ #ifdef GDK_WINDOWING_X11 #include #include "x11/gdkx.h" +#elif defined GDK_WINDOWING_WIN32 +#define WIN32_LEAN_AND_MEAN +#include #endif /* Number of elements in the custom palatte */ @@ -1311,7 +1314,7 @@ key_press (GtkWidget *invisible, return TRUE; -#ifdef GDK_WINDOWING_X11 +#if defined GDK_WINDOWING_X11 || defined GDK_WINDOWING_WIN32 case GDK_Up: case GDK_KP_Up: dy = state == GDK_MOD1_MASK ? -BIG_STEP : -1; @@ -1340,6 +1343,12 @@ key_press (GtkWidget *invisible, #ifdef GDK_WINDOWING_X11 XWarpPointer (gdk_x11_display_get_xdisplay (display), None, None, 0, 0, 0, 0, dx, dy); +#elif defined GDK_WINDOWING_WIN32 + { + POINT point; + if (GetCursorPos (&point)) + SetCursorPos (point.x + dx, point.y + dy); + } #endif return TRUE; -- 2.30.2